(bug 21814) Don't show broken user tool links when rolling back an edit that has...

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 8e87f7a..2879208 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -681,6 +681,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
   for namespace)
 * (bug 20765) Special:ListGroupRights no longer misses addables and removables
   groups if there are duplicate entries
+* (bug 21814) Message shown when rolling back an edit with a deleted username
+  now shows '(username deleted)' instead of broken user tool links
 
 == API changes in 1.16 ==
 

diff --git a/includes/Article.php b/includes/Article.php
index 6209041..a8421a8 100644 (file)
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -3197,8 +3197,12 @@ class Article {
                $newId = $details['newid'];
                $wgOut->setPageTitle( wfMsg( 'actioncomplete' ) );
                $wgOut->setRobotPolicy( 'noindex,nofollow' );
-               $old = $wgUser->getSkin()->userLink( $current->getUser(), $current->getUserText() )
-                       . $wgUser->getSkin()->userToolLinks( $current->getUser(), $current->getUserText() );
+               if ( $current->getUserText() === '' ) {
+                       $old = wfMsg( 'rev-deleted-user' );
+               } else {
+                       $old = $wgUser->getSkin()->userLink( $current->getUser(), $current->getUserText() )
+                               . $wgUser->getSkin()->userToolLinks( $current->getUser(), $current->getUserText() );
+               }
                $new = $wgUser->getSkin()->userLink( $target->getUser(), $target->getUserText() )
                        . $wgUser->getSkin()->userToolLinks( $target->getUser(), $target->getUserText() );
                $wgOut->addHTML( wfMsgExt( 'rollback-success', array( 'parse', 'replaceafter' ), $old, $new ) );